<html>
<head><meta charset="utf-8"><title>bors · t-compiler/rust-analyzer · Zulip Chat Archive</title></head>
<h2>Stream: <a href="https://rust-lang.github.io/zulip_archive/stream/185405-t-compiler/rust-analyzer/index.html">t-compiler/rust-analyzer</a></h2>
<h3>Topic: <a href="https://rust-lang.github.io/zulip_archive/stream/185405-t-compiler/rust-analyzer/topic/bors.html">bors</a></h3>

<hr>

<base href="https://rust-lang.zulipchat.com">

<head><link href="https://rust-lang.github.io/zulip_archive/style.css" rel="stylesheet"></head>

<a name="221985258"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/185405-t-compiler/rust-analyzer/topic/bors/near/221985258" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Phil Ellison <a href="https://rust-lang.github.io/zulip_archive/stream/185405-t-compiler/rust-analyzer/topic/bors.html#221985258">(Jan 07 2021 at 18:59)</a>:</h4>
<p><a href="https://github.com/rust-analyzer/rust-analyzer/pull/7097">https://github.com/rust-analyzer/rust-analyzer/pull/7097</a></p>
<p>What does bors actually do here? After this PR was r+-ed it ran tests and complained that the new test in my PR wasn't using $0 to indicate the cursor position. This makes sense - my PR pre-dated that change. However, I'm not sure what to do about it - there are no merge commits on the PR itself. I've tried pushing a change to update just the cursor indicator in the newly added test, but this results in the tests failing and complaining that the _old_ cursor style isn't present.</p>
<p>What's the current workflow here?</p>



<a name="221985437"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/185405-t-compiler/rust-analyzer/topic/bors/near/221985437" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Jonas Schievink  [he/him] <a href="https://rust-lang.github.io/zulip_archive/stream/185405-t-compiler/rust-analyzer/topic/bors.html#221985437">(Jan 07 2021 at 19:00)</a>:</h4>
<p>Try rebasing the PR onto current master</p>



<a name="221985448"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/185405-t-compiler/rust-analyzer/topic/bors/near/221985448" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Lukas Wirth <a href="https://rust-lang.github.io/zulip_archive/stream/185405-t-compiler/rust-analyzer/topic/bors.html#221985448">(Jan 07 2021 at 19:00)</a>:</h4>
<p>^</p>



<a name="221985502"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/185405-t-compiler/rust-analyzer/topic/bors/near/221985502" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Lukas Wirth <a href="https://rust-lang.github.io/zulip_archive/stream/185405-t-compiler/rust-analyzer/topic/bors.html#221985502">(Jan 07 2021 at 19:00)</a>:</h4>
<p>The tests are failing cause your branch expects <code>&lt;|&gt;</code> still, bors tests your changes on top of master though which expects <code>$0</code></p>



<a name="221985759"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/185405-t-compiler/rust-analyzer/topic/bors/near/221985759" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Phil Ellison <a href="https://rust-lang.github.io/zulip_archive/stream/185405-t-compiler/rust-analyzer/topic/bors.html#221985759">(Jan 07 2021 at 19:02)</a>:</h4>
<p>Thanks both. I've rebased and force pushed</p>



<hr><p>Last updated: Aug 07 2021 at 22:04 UTC</p>
</html>